From 1accdcc8c346905b664dbd844f0bf09ad8f1cb80 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 10 Feb 2011 14:19:54 +0000 Subject: [PATCH] x86: suppress HPET broadcast initialization in the presence of ARAT This follows Linux commit 39fe05e58c5e448601ce46e6b03900d5bf31c4b0, noticing that all this setup is pointless when ARAT support is there, and knowing that on SLED11's native kernel it has actually caused S3 resume issues. A question would be whether HPET legacy interrupts should be forced off in this case (rather than leaving whatever came from firmware). Signed-off-by: Jan Beulich --- xen/arch/x86/hpet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index d27a4d1c02..0df678842f 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -557,6 +557,9 @@ void hpet_broadcast_init(void) u32 hpet_id, cfg; int i; + if ( boot_cpu_has(X86_FEATURE_ARAT) ) + return; + if ( irq_channel == NULL ) { irq_channel = xmalloc_array(int, nr_irqs); -- 2.30.2